Makefile.decl: Set G_TEST_SRCDIR and G_TEST_BUILDDIR
authorMatthias Clasen <mclasen@redhat.com>
Thu, 30 May 2013 01:35:53 +0000 (21:35 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 30 May 2013 01:35:53 +0000 (21:35 -0400)
These variables are needed to make file location functions
work.

Makefile.decl

index 0f00030a6ec70fa977ef24962b0deafbc6f22a97..3fcd6565304ab27613df2788073baf25bb8f4ca7 100644 (file)
@@ -40,7 +40,7 @@ test: test-cwd test-recurse
 # test-cwd: run tests in cwd
 test-cwd: ${TEST_PROGS}
        @$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
-         $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) ${GTESTER} --verbose ${TEST_PROGS}; }; \
+         $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) G_TEST_SRCDIR="${abs_strcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose ${TEST_PROGS}; }; \
        }
 # test-recurse: run tests in subdirs
 test-recurse:
@@ -70,9 +70,9 @@ test-report perf-report full-report:  ${TEST_PROGS}
            $(XVFB_START) && { \
              set -e; \
              if test -z "$$GTESTER_LOGDIR" ; then \
-               ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
+               G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
              elif test -n "${TEST_PROGS}" ; then \
-               ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
+               G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
              fi ; \
            }; \
          }; \